From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Thu, 9 Aug 2007 09:36:31 +0000 (+0000)
Subject: (mac_handle_window_event) [USE_MAC_TOOLBAR]: Add further workaround
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~17456
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5e1a778107d4647c697a78bd3316d3d869806d0e;p=emacs.git

(mac_handle_window_event) [USE_MAC_TOOLBAR]: Add further workaround
for window repositioning.
---

diff --git a/src/macterm.c b/src/macterm.c
index d1d9205d5dc..7d6934b806b 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -10719,7 +10719,10 @@ mac_handle_window_event (next_handler, event, data)
 	      /* This is a workaround.  RepositionWindow fails to put
 		 a window at the cascading position when its parent
 		 window has a Carbon HIToolbar.  */
-	      if (f->top_pos == sf->top_pos && f->left_pos == sf->left_pos)
+	      if ((f->left_pos == sf->left_pos
+		   && f->top_pos == sf->top_pos)
+		  || (f->left_pos == sf->left_pos + 10 * 2
+		      && f->top_pos == sf->top_pos + 32 * 2))
 		MoveWindowStructure (wp,  f->left_pos + 10, f->top_pos + 32);
 #endif
 	    }